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

Merged-In: I678f9d98ba4550cfa1c16c98f57d216ff31ad99a
Change-Id: I74c4c80e03bfa41b9e8cd13f3cfcbe9ac6efdd50