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

Merged-In: I568c9f7f1e0e3deb561b13ccb2fd5ef99463b360
Change-Id: I7f3a5953100762858d24643624e437854c390d99