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

Merged-In: I8d13832dd297c5ca7ddeb87fb5302e5bad82c309
Change-Id: I9d5a74b5189e6b445ef922da0f81884d60ac82f4