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

Merged-In: Ie21d558275f6d7580a9963d72d5cba92ed30b962
Change-Id: Idfc0cf1eef011951806ff34b84f09b974203b024