Merge "Title is different after tapping "Memory used by apps"" am: 7d9146e10a am: 4604741c51 am: b9b563d243
am: 381570cda2

Change-Id: Ifd8fbcfa5a4d0e5aa8598fb26b4158b01db230c3