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

Change-Id: Id276fbc68b12985074393454f729f950612685ed