Merge sc-mainline-prod

Bug: 189946434
Change-Id: I2212f62f9ec8d2993705dcb37f321035c68d2e05