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