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

Merged-In: Ide6ee346afdd6f9f0bca90a22465fd0d76af8b6a
Change-Id: I854661d3c39b306d304c2b74724d802312555bf5