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

Merged-In: Ieee745bac112bd8412e9ca5d4d50a1463666e94b
Change-Id: If40b13f6263a3c0123916bb95a987505e78767a2