Merge "Downgrade another duplicate method DCHECK to WARNING" into oc-dev