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

Merged-In: I6a6ee63e2a133b14e77520f4505c8d646f864f3d
Change-Id: Id6170b9a4167d5b51079c94bed8fd0a71d3be4ec