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

Change-Id: I5b7f951a9e8c48fb746aa87885e6ced635bb5613