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

Merged-In: I3e0b35f5a1b3d56a9b0a59d2e457c36bc909bef6
Change-Id: I7083ed5cfd0668b4673e4809eb804ac8556abda8