Merge "Change receiver name attribute for DISCOVERABLE_TIMEOUT" am: 8cb4301b59
am: bf942b7e11

* commit 'bf942b7e11df7ef29b64eb8941dc6d08082b89ba':
  Change receiver name attribute for DISCOVERABLE_TIMEOUT