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

Change-Id: If597b7572324c590a2ab977be455efea91831e32