Merge sc-mainline-prod

Bug: 189946434
Change-Id: I6cd8d3824d901b8c4b0bea8d6aa45f74cc56d56d