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

Merged-In: I6c04392327641aba116a39985b0a9a23b67d1a7c
Change-Id: I2ef210ed313638afa9db8004f1ebbf5508d06911