Merge "Fix bluetooth icon has wrong color"
am: 98deadb73a

Change-Id: I83ab00839b20cbd8c5fade82fdec6a6c0e3982ca