Merge sc-dev-plus-aosp-without-vendor@7634622

Merged-In: I3187fe574f21977fa8006ab92072636f2ee110ce
Change-Id: If0b691fb263ee2717844e8bda388310d2360ffd6