Merge \"Fix clang static analyzer on potential memory leaks.\"
am: f79c0e6f74

Change-Id: Iaa9dd0266305d860437774505226d3ee5f1793d0