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

Change-Id: I9f78146f78bdd0ded2fd292d8746d3c9b1e4217b