Merge "Fine tune tests" into rvc-dev am: d473cf177d

Change-Id: Ic8ff522f27dc47d42f22ae192ab5629d7a54f473