Merge "Merge commit 'bc07fc244ff78cf4d4805c9d456a580ccec8ccd4' into stage-aosp-master" into stage-aosp-master