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

Merged-In: I0e6757991098b2174d9024a612bd60ca6c623567
Change-Id: Id690fcd4d72b9beb7fc605bb35abb208ac0a6bda