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