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

Merged-In: Iefc43953a0d9e45162574479fa889acd7930b32d
Change-Id: Ibac10766358da418de5f64487275292845aa86cc