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

Merged-In: Ie57a0453d007e6eb2d21ccbfe11888f8182ade36
Change-Id: Ibbc220dfaf24fe5868af6396b9c7e0783421dacd