Fix double status bar icons am: 12124d7eca
am: 829548a3cb

Change-Id: Ieeb5792253ef05bf8a4d41aa1074a613c012626c