Merge sc-mainline-prod

Bug: 189946434
Change-Id: I84ceaa36e684f4949e10cb513aee0d33664dab2e