Merge sc-mainline-prod

Bug: 189946434
Change-Id: I57bb27101536b9f873bce64660158eef6083e95d