Merge sc-mainline-prod

Bug: 189946434
Change-Id: I023339cdcf0d69dfca57c0872e94d2043802718d