Merge sc-mainline-prod

Bug: 189946434
Change-Id: I104da3dbb263c53add402c03ce4e8403c2ca06c1