Merge sc-mainline-prod

Bug: 189946434
Change-Id: Iab8732c90f77e8d3731914b0831403b9c8d9d708