Merge sc-mainline-prod

Bug: 189946434
Change-Id: Ib79ee17f339c6db97d9770f569cc437479b65173