Merge sc-mainline-prod

Bug: 189946434
Change-Id: Ib78a902551581f35f939f7b7b3b7435769f84700