Merge history of Nearby

BUG: 222234190
TEST: TH
Merged-In: I7fd9cc67244f2533057e679b0bc5e1db126cd399
Change-Id: Ie3b9bebae8593e974cfb78207ad6bb53c70f5f3c