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