DO NOT MERGE Add location shell commands to R am: bfe15a139d am: 0143bd6e7f am: 55d6e0a27a

Change-Id: I21f67816eafaab0e4d7e80515bb944030943fa20