Merge "Fix Mapper Protected test" into rvc-dev am: 7b25582017

Change-Id: I77a9bec2005f2999ed09cd1e7a3a7a501b957b3a