Merge sc-mainline-prod

Bug: 189946434
Change-Id: I048c04d0b3891aa46733326ada77210e9d6ec461