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

Change-Id: I01bcb74862acd788a46e3dc7191966aec27f6f54