Merge sc-mainline-prod

Bug: 189946434
Change-Id: I5236888f59fc42b96bad4b2d02d2bbf59c3bd6ae