Original change: https://android-review.googlesource.com/c/platform/development/+/1845159 Change-Id: I0630a35da632fc31b294afd916dd9dbea5f982fa
Original change: https://android-review.googlesource.com/c/platform/development/+/1845159 Change-Id: I0630a35da632fc31b294afd916dd9dbea5f982fa