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

Merged-In: I9b673f89a2827118532bcbee229b7cbf9e865b02
Change-Id: Ifea01915497482aeee896bdc7972a717397635ae