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

Change-Id: Ia0e008670e8222e0c2d4d9876edb96251931611b