Merge "Fix memory leak in ApplicationStates" into pi-dev
am: 7e646bf922

Change-Id: I9c323b50035fcdab6d34eba83e16afa27672c7bb