Merge \"Fix double status bar icons\" into nyc-mr1-dev
am: 9448f1b74a

Change-Id: I49f42dd69e0fffbfa10d8616199452b1d22cd492