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

Merged-In: I53d54e3d93a6640c0d1c42971707b2992f251600
Change-Id: I71c2b6918f5194399c94faa91972512fabe41e7f