Fix clang static analyzer warnings.
am: 1f80f8a13e

Change-Id: I38861d9e6a7ec4cef19f9278a3c99ffe19215f34