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

Change-Id: I6e4ffea5238afd3efb6e4864a7b2d5eb3bb6b644