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

Change-Id: I84b2bcab245ca702a1dd7488d240d1b9264b3c9d