Merge changes Ief9c7453,Ifb3a0618 into rvc-dev am: 7c10f3f277

Change-Id: Id6a5aafaf2dc04f114d4d89d43446f7bc959c19f
tree: 75b15537eb624d1d292ecd3a1985e9d00a8df7da
  1. tests/