Merge sc-mainline-prod

Bug: 189946434
Change-Id: Id7d2f268b3ee27da9208dfdb70901e181f8cd596