ASACORE-1097 Fix R2R unit test failures.

Change-Id: I4605d965a0389740cc62ad8aea233828affb043f
Signed-off-by: M. Sanu <msanu@qce.qualcomm.com>
Merge "ASACORE-1097 Fix R2R unit test failures." into RB14.12