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