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