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

Merged-In: I93c0c690632ff072eb1430fa63bfaec80d78c768
Change-Id: Id6088ae38b04e4587c41eed55b0a93051c4b353e