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

Merged-In: Iab54479d220a886fbcdfcea3521c5eba2ced197f
Change-Id: Iaaa952634e317c0528834e4ba7b18c4ba608ddba