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

Change-Id: I540c31742b70b07dffd36e1a7cb7a6b6eadf8c0a