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

* commit '8cb4301b59f95bff09526c32b30ecde396e164f7':
  Change receiver name attribute for DISCOVERABLE_TIMEOUT