Merge changes from topic "test-utils" into rvc-dev am: b80d16e4eb

Change-Id: I6705278a3089e3284f1a687872f64fc041485a1c
tree: 9bbc543d96a8b8a401e46f77965e87dd5283f358
  1. tests/