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

Merged-In: If8e7edf2206a6d01d96b89a8e3f9c1396a282776
Change-Id: Iec734ba978828f123e524782bf4bce971ccfaede