Merge sc-mainline-prod

Bug: 189946434
Change-Id: I3384a47b9bcc55f512ea398f42dc5d7aba5e3d1d