Merge "Downgrade duplicate method DCHECKs to WARNINGs" am: f11cbe1361
am: ca5fa59e09

Change-Id: I587702e23791393051b36865a82e2fe84944288b