[automerger skipped] Merge changes from topic "test-utils" into rvc-dev am: b80d16e4eb -s ours
am skip reason: Change-Id Ieaceaadf116cb2885cbf22ae48579cec88268416 with SHA-1 bba019dc40 is in history
Change-Id: I484b8e60f66a938b27ccacf3978f8bebf94d3265
This commit is contained in: