Merge "Fix heap use after free." into pi-dev
am: fa3a2f294f

Change-Id: Idf2a41815f66f7428307e92af85de1e26aa41f4f