Merge "Merge "Leave spaces between Operator name and Clock in StatusBar" am: 375af769e6 am: 3832515acf am: e06b199457"