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

Change-Id: I8ea23e591cfd690ebbe9fcab463ffc0429ac3eec