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

Merged-In: Ia1aa63b7495a82d72da0ca5a70e1bda473cedc91
Change-Id: I40ce7b1692e93617aec9de7a0d3a8b154fdf7a02