Merge sc-mainline-prod

Bug: 189946434
Change-Id: I01e30cb7ff12bb48ea194af0dd5fea7f1b0bf90d