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

Merged-In: I48fb37b9fb8af94825f6e7c3ea05b9620c8e1a7e
Change-Id: Id3c0fdf3aa6bf3111ddfcd0c21cb5c62ae1d8b82