Merge sc-mainline-prod

Bug: 189946434
Change-Id: Id6b3ccb4fa37592beb9a0abca0979a722cb96f60