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

Merged-In: Ie2f11416771f69dbe662ed119ce360b7c773cbd0
Change-Id: I5e87442f10aa57190272c73037c1b47e968d2c79