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

Change-Id: I636dec17e6745c799991a3ba5b6f11a451465f60