Merge sc-mainline-prod

Bug: 189946434
Change-Id: I83c21c236626503bc60d37f587b57b089c2d2aa6