Merge "DO NOT MERGE Add location shell commands to R" into rvc-dev am: c7206030 am: 25ea50d8 am: cf8f63ca Change-Id: Ib3d3b026e35c12dd05e50ecf55fc9c9a79e47de6