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

Merged-In: I3f24a0a4debf387f7924f88c922284b55a44946c
Change-Id: I3f26c7349bb46ddd70b75527102babac5d328f8a