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

Change-Id: Ieed394f65ac61cecd79bf822f495663044dbfd07