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

Change-Id: I14d3144b9a5f21f47e2611d7fad1d05ef624ad96