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

Change-Id: I16787e69b13f26068a5bd3496a29915ad392d48d