Merge "Color/tint the wifi/mobile status bar icons correctly" am: b3866aeee2
am: 337b8a6185

Change-Id: Id99bd7df01558ebe07524067f18b0c0451a99ea7