Merge changes Idadefb77,I733f3ebd into pi-dev am: 89bdcb9d28 am: 3e9b2d6286

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

Change-Id: I91e8c57259beeea248a19e31948f89fd773e9931