Merge "Merge commit 'aaf823d2' into lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp