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

Merged-In: I322c6a9d84b2e765389193bc93872fae641b6676
Change-Id: I1af8f02da1e99973cdf3ee742bf1858f1472fd6f