Merge commit \'a4eb81b\' into klp-modular-dev-plus-aosp
automerge: 068cb36

* commit '068cb36877144dc337766c1113250f5ebc2cbf6f':