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

Change-Id: I99d059f7252908e3c4ea3b281ec06248b4e605b6