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

Merged-In: I743ce25b43b75e9c2ee24580749a292608d16313
Change-Id: I93bf9e6af8b5974f314a4da28410f98bccfced2d