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

Change-Id: Id446fa135e7035355c24dafa448b7450d1d05ad2