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

Merged-In: I91d34abdd7a84053aa4dc0c16d32b0ffcaa75619
Change-Id: Ieccafa6fb2fea229b5b60b828c0c94a3dc7fe77a