Merge sc-dev-plus-aosp-without-vendor@7634622 Merged-In: I3df22a44ee75fa2f55e1329d749e92d7d2f8a0ef Change-Id: I41164ccc5c7eeb1bbc85b071bb79a3a39ddd6ec6