Merge sc-mainline-prod

Bug: 189946434
Change-Id: I61485c1cd7cdc15753a46332c817b9de5af16280