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

Change-Id: Ib315b1f5e7c2244bb1fe60ec19425dc14048bdcb