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

Merged-In: I085f90a064bfcf2ad9c9f98c8c38c93a32830a03
Change-Id: I02b12ffcfc0826054f0e446254e7fd0b47155975