Merge sc-mainline-prod

Bug: 189946434
Change-Id: I49e389645b7a1ba0b2b1640af3093ef0798b559a