Fix double status bar icons am: 12124d7eca
am: 447991c67a

Change-Id: Ic0a217f292dcf4a7d9b2b47c4d32438b436a77ad