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

Merged-In: If01f87c68f2ba0518fc256fffa785c9cd6f699ee
Change-Id: Icf16224e798492e78d32717df442b033d005ddaa