Merge "Fix clang 7.0 warnings."
am: 2366452ae3

Change-Id: I46b968a9b110da75f8074b3c58f42974822946b5