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

Merged-In: Iaf9da67b88eb9f43356c3a5539248db69681d8c2
Change-Id: Iaa926aa00e7d1a5a1604cf8c01c4bc66be05e678
tree: 5680cd96b46de096460baf08f8f8da831a72d00b
  1. 30/
  2. S/