Merge sc-mainline-prod

Bug: 189946434
Change-Id: Ifaabce5ddb636d3729330b4e01988ebaa5dfb7e7