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

Change-Id: Ib654083797a0af9341eb69d860db7992a91c4706