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

Change-Id: I7b46a8fe7c01496dbc74f2fd59d6cc265f3624c3