Merge sc-mainline-prod

Bug: 189946434
Change-Id: I0afb1d19e705a11cdd4d0c5f68fdfe98cfa202e4