Merge sc-mainline-prod

Bug: 189946434
Change-Id: I6eb5e3b4978202b396ef10f269b4fadfcb6115fe