Merge "MapClient compatibility updates" into rvc-dev am: b496fd7914

Change-Id: Ia41adca09b4cf410ce61a21884f93a8935a05ddf