Merge sc-mainline-prod

Bug: 189946434
Change-Id: I0bda07945d7f5049d2f56ee6d114c52005bbc77c