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

Merged-In: Ie1a8c72faa378d7643b6c1d43928d83c9d740a6b
Change-Id: I9bb827bc5cf4f2bb5dc7cbb81d26aa44b074d366