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

Change-Id: I26a294168333a22a4ab6f7428c070c34b2cc07cf