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