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

Merged-In: I859cb4a02bf278dec9a31cac1efb2ce5cb05fa20
Change-Id: I972cce490ce5f64ed513b7c8b6b7ed1a884af731