Merge changes Ic4fbcfda,I4eea9b75 into oc-mr1-dev am: 42b5f3bca7 am: 3d0ebd9cdb am: 3beb89ea61 am: 59423890a4 am: 3d913df3df

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

Change-Id: I45132e769e37282e80a56fd42e069cded7f6efed