Merge "Fix clang 7.0 warnings." am: 2366452ae3 am: 35a4f49e72
am: 197b6799f8

Change-Id: I1664b64bb7e40fdb141f6669190d615102e711a3