Merge "Fix race condition when doing GATT discovery" am: 82e316efe6
am: 9ff4e56e2b

* commit '9ff4e56e2b6ade75aba3c48ed26eab06290bbf61':
  Fix race condition when doing GATT discovery