Merge "Downgrade another duplicate method DCHECK to WARNING" am: 5e07b5acc0
am: b3fbd8b64b

Change-Id: I6ec489f245bc38db04d44341f721a8d17538f0a2