Merge "Add an interface for stopping in certain maps." am: 3adedf9895 am: 4e9a5eec5d
am: b247b6f939

Change-Id: I3ba56d8f35f81a70b320de1efdefe17aeb296f34