Merge "Restore GATT unit test"