Merge \\\"Fix clang static analyzer on potential memory leak.\\\" am: fc17d9022b am: a85c412ea8
am: da9def4fb3

Change-Id: Ie6665fd5594edae714bf408618a2e12a913c18a8