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