Merge "Suppress clang 7.0 warnings." am: 65404f0764 am: c289ebc98c
am: 8ba48e28e1

Change-Id: Id622a06f97a83a1a3473643249d3f908d7598fe0