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

Merged-In: Ibd5933cd1bd1b831e7eea5147eca3799faf0ad1a
Change-Id: I81da1fe802c2ce5be6058918e2d7cec2ec1a8890