Merge sc-mainline-prod

Bug: 189946434
Change-Id: I4f9e75fb308e44b53e3c56d8a24adfaf61d431fc