Reconcile gatt

Change-Id: I30cbcf2c1c6d8528596d71ed2a03576263833ab4