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

Change-Id: I7bc2266d1b3d37ea8642dff1d2d772922dcfe429