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

Merged-In: Ic5964c07fe65677f54abdb0135af3a57f0754dde
Change-Id: If157a46c485c6d56c3ae65187ce0fa4b3c76676a