Merge changes I43dcd40f,I409325e5,Ib3c613a3,I1252c0b5,I00c36184 into oc-mr1-dev am: 1f3f4e574d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieebf8264b518250ac2f2e19c719da2904201e3d2