Merge changes I3d14a7db,I31956c84,I01a36836,I44563a4e into oc-dev am: 16565c37f3

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/12865596

Change-Id: I6404afc8b59985f5763b26b61951814e465dd6a1