Merge "Suppress clang 7.0 warnings."
am: 65404f0764

Change-Id: I50cafe244e25ea494c550cee8e10c92f48a15bcd