Merge "Fix ApplicationsState.Session memory leak in settings app" am: 00a2619a10
am: 7b357f0b55

Change-Id: I5d7d5041c32c18c2ce50b883656cdce28daa4d93