Merge "Fix clang static analyzer warnings." am: 1226a847e4 am: c63fb3cc14 am: d043ed00cb
am: 3d53a93c79

Change-Id: Icd83d9940f0ebe4fc9916de88a85a7ea36a5538f