Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2005890 Change-Id: I709c31881408f30a29c5d2d2fb32659f0fed8f06
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/2005890 Change-Id: I709c31881408f30a29c5d2d2fb32659f0fed8f06