Merge sc-mainline-prod

Bug: 189946434
Change-Id: I3b2d3a7297858f9d8100f0bb2c4a890afd5418b6