Merge sc-mainline-prod

Bug: 189946434
Change-Id: Ie315804bc8843c86ae02072c4a222087be8618a4