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

Change-Id: I4e7a08cb71592441f0b3ace4ced1d7cb17985695