[automerger skipped] Merge "Fix memory leak in ApplicationStates" into pi-dev am: 7e646bf922
am: e1ac18136f  -s ours

Change-Id: I5638f4e95ba18bee2c0386e289974763c2766401