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

Change-Id: Ib5fbaa3f956be5fbfd840e35141bf90916b5464a