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