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

Change-Id: I8c57a84cd36cef11b2db587b49b4bc60e067ebac