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

Merged-In: Ie2f468b9b8ca85cbba055ccf3aa6bb0cd6de378a
Change-Id: I90187609ee9ba51bca7036a89ce46f1c08bbf1b3