Merge sc-mainline-prod

Bug: 189946434
Change-Id: Ia9bb12935e58bbca66dd0946fac2e903062848e9