Merge "Bluetooth GATT callback naming fix "Ext" -> "" (1/2)" am: beb8ceada8 am: cfe099b01d
am: b4e8fd65bf

Change-Id: I31be1d92cf7ad95214bf353dca20b990a280f996