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

Merged-In: I1558ea1525a82d50919b9a3615b05e32451aa17f
Change-Id: I3c683d6d0792a58c45305a247da42b0127cc28e3