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