Merge commit 'bc07fc244ff78cf4d4805c9d456a580ccec8ccd4' into stage-aosp-master

Change-Id: I01508478f7346cb6bc1cd69d41fad1ab74acf9de