Merge sc-mainline-prod

Bug: 189946434
Change-Id: I848aa2192284657d07809db529b31dc58716b0ed