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