Merge changes from topic "iorap-perfmaster-fix" into rvc-dev am: 5c0b30caab

Change-Id: I9d10a785a1f7a997cb2623c0b0d62340c9bba627