Merge "Clarified the length of time that a device is discoverable am: 62750991 am: 7476323d am: 5051b0ec" into nyc-mr2-dev-plus-aosp