Merge sc-mainline-prod

Bug: 189946434
Change-Id: I856a9ef88e6527876edc0847b5d4e9e00e6843aa