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

* commit '82e316efe6568d498a9bca1477745c429ac287d1':
  Fix race condition when doing GATT discovery