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