Merge "Misc tidy up before adding geolocation classes" into rvc-dev am: 71271db6 am: ac646f55 am: 8d22e01b am: 67bb28c5 Change-Id: I2c131a1f8350d11aeb6e95df98c31e782f01767b