Merge "Add bluetooth icon." am: af76131710 am: 94628539aa
am: d619ec0d0e

Change-Id: I04f91bd35dfd8363368435dd8d605f0a2fb58f15