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

Merged-In: Ie81fb72a80f2d8720aedac0d5e100469b66e584e
Change-Id: I5c53eaff7cad32bd5879dfb7a66690425c8be912