Merge \"Merge \\\\"RefBase: Silence compiler warnings\\\\" am: f76ca2a43b am: 3b43562535 am: 0c9b9ec4dc\" into nyc-mr1-dev-plus-aosp
am: 9953098973

Change-Id: I5cf302ece40670248a8575fe66aaf6df9a3d9abe