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

Change-Id: Icdafcd3adb871ee086aad1734bebafc8f6a99b9b