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

Merged-In: I914766c7f155468a250afe5b8f42a16c57b1ea35
Change-Id: I6f522d6d244351a294cfa10defa2744cf5f16564