Merge sc-mainline-prod

Bug: 189946434
Change-Id: Ie14e91501c001f91ce4c24e67028ebfeb35aad42