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