Merge "[Nearby Devices] Minor updates to API based on API review." into tm-dev