Merge sc-mainline-prod

Bug: 189946434
Change-Id: I5c0b4053805799e645e4e655deab504f9a1aa586