Story 484: Push nearby to stable

Change-Id: I46c08e114b5f7f9866e7c07dadf815fda46be44a
Merge "Story 484: Push nearby to stable"