Merge "Change fillColor for Wi-Fi badges to #FFFFFF." am: c1940ef392 am: 380341f6c8
am: 18d7a5e95f

Change-Id: I9e0240a30524436d13c60c3a1251064012c6f7bb