Merge "Merge commit 'fb96e54' into manualmerge" into lmp-mr1-dev-plus-aosp