[automerger skipped] Merge changes Ic0f71df7,Ib6635f00,Ia5d35c32,I9aeafa45 into rvc-dev am: 477e59f84a am: 71742ff0e2 -s ours

am skip reason: Change-Id Ic0f71df739bd9162653b5f2878e7ddc446ddde0e with SHA-1 1f0bdd40bd is in history

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