Merge sc-mainline-prod

Bug: 189946434
Change-Id: Idaea38093e04c7696ad14935484a99d7f7dcc222