Original change: https://android-review.googlesource.com/c/platform/cts/+/1470543 Change-Id: Iaeec1eb060b01ce898591bcb7c9c280ca9b04839