Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/17349063 Change-Id: I6acc474fa835d3d940b44d78478fdb6cc6386f64 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>