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