Merge sc-mainline-prod

Bug: 189946434
Change-Id: Ib8fcce602375dc589a16207ef5afc3352fa3e5d0