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