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

Merged-In: I7c9d411dc123b70bf27499458f35be7ad4e6387b
Change-Id: Idc11f6c232f2a67d7ff898f50e6c70dd7c7733a9