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