[automerger skipped] Merge changes from topic "ike-cts-mts" into rvc-dev am: 64db03e386 -s ours

am skip reason: Change-Id Ib747c8cdfe1827e8df2aa7544e28e98a177d3d1c with SHA-1 34e71a5b68 is in history

Change-Id: I890d052dde789952cd620360ed37b13905d42ae0
tree: 976ba83a4bd2acb824be31408b4a8eaac48e1853
  1. tests/