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

Change-Id: Ie4990b7436e8da99170196645527b8bedc3f11f2