Merge "Fix memory-leak warnings from the static analyzer" am: 2006bfc9ad am: 43fd84a03c
am: 0d0ccb0c19

Change-Id: I0abbba291721af2b66735dcbd33bbc406767536c