Merge changes Ib51be068,If07e7dfa into oc-mr1-dev am: cc6c424027

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ffc885326d44c2a859a12794590568b36518be4