Merge sc-mainline-prod

Bug: 189946434
Change-Id: Ifc92f321a53a235323c140e148f3033b1c124ae0