Merge "DO NOT MERGE Add location shell commands to R" into rvc-dev am: c720603034 am: 25ea50d840 am: 50fe5df825

Change-Id: I6b22416f080d6c50cd6728e3d167df41d6b009c5