Merge changes Ibf6bf1ac,If782590b,I7f1cbe9d,Ia6bed394 into oc-mr1-dev am: ba2284c81a am: 1e62c58e0c am: 13c936b29c am: a7fc337d5d

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

Change-Id: I479e706fdf64808db610629cd0565f9c3e8eb9d7