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

Change-Id: I2267f36851db731969e94a44c0692c8cde617289