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

Merged-In: Idee67b0816da8a217495a1849b63ada58cdfc936
Change-Id: Icbad3b6b144a9a58d38289127fed45e3887a26f8