Merge sc-mainline-prod

Bug: 189946434
Change-Id: I1425c8d6297151cc03ffb5e8e600523db6bb904d