Merge changes Ic0f71df7,Ib6635f00,Ia5d35c32,I9aeafa45 into rvc-dev am: 477e59f84a

Change-Id: I3f43d034bb160478b2c2f4c2d14cbc0df3d2a8cb
tree: 7bff4e8a02b8cdbeb6eef163f8bfee161a0b8ac9
  1. tests/