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

Merged-In: I6a79e247c9a86b5761daebbfa21e7959610056a9
Change-Id: Id9fbd3572ea275b162b79563e46d10f5a51df8f6