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

Merged-In: If257ce0fd2069dea23ffd82f8356eb4cc70bdafb
Change-Id: Id2b77e99757ad1f6a702b5abd2a15d27f25013c8