Merge sc-mainline-prod

Bug: 189946434
Change-Id: Ibe6583b466b604de9e0a9dbbdf699f5761ae21f3