Merge sc-mainline-prod

Bug: 189946434
Change-Id: I61ef1503c70f4c644906f5227f71d02ae45d5808