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

Change-Id: I6671f8df8764945b34fc3ccf30594164be4905c2