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

Merged-In: I1851881b4c639ab5ec8b27bcc8a92fb9218a93c7
Change-Id: I7b09b730f08983d74daa74d7410a533428738c81