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

Merged-In: I484fe79efdf22d5e7eec7d7bee43a7f622115244
Change-Id: I203c591917c9da5b44f12c9822522e0f4cc15599