Merge history of Nearby

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