Merge "Fix clang static anaylzer warnings."
am: a97d58a21b

Change-Id: Id66bd914d41190df5c3dc29968fab5b7f942851d