Merge changes from topic "iorap-perfmaster-fix" into rvc-dev am: 5c0b30caab am: 5f08fe7d36 am: 3f1bfab238 am: 50f9687c97 am: 0af55f49cb

Change-Id: Iba108d27a47841aeffc05f130183b37546b46ed4