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

Change-Id: Id2ad42ca0295cb2819d9b5de5e735b2f371919c0