Merge "Preserve icon for "manage space"" am: c39b3dfd76

Change-Id: Ic24c59d88117a9e0a6f61e2c1b0e2726a1546487