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

Merged-In: I975ce2e612e979884c82ef9da6e70b70dce076aa
Change-Id: I269ea522ba7356dca0bfa43e8a8ee8acdba7b7a2