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

Merged-In: Iacd606ac8d4b0a8326c5d80c8d22b629401fcf02
Change-Id: Id5f58e8cb24bcba19ec2253a9ca5d0703a54b43b