Merge sc-mainline-prod

Bug: 189946434
Change-Id: I2b95b88fe172fca1894a5f82f1df909cf5830f37