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

Merged-In: I1503e40bd55ad8595965e407abeb2df9e1b183e4
Change-Id: Idd6cbea1c9120e195f6304bcb642ab48968bf858