Merge sc-mainline-prod

Bug: 189946434
Change-Id: I31dbdfe167b0b1c58bccbac7815691674a9a825b