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

Change-Id: I29d3319ab271e1dd42f7af15f917f97619972cd5