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

Merged-In: I93ffa802aad30a24f4222107d7b339927f5d4ce7
Change-Id: I0a1bcf30e04204c56c7fed91e4dfa4af80346404