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

Change-Id: I1cc62db1a6e8ef153e5aeaaa216218b88c538daf