Merge sc-mainline-prod

Bug: 189946434
Change-Id: I2413ec273fc9b290ccae7cad3486ca1aa05fcc96