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

Change-Id: Ib3d3b026e35c12dd05e50ecf55fc9c9a79e47de6