Merge sc-mainline-prod

Bug: 189946434
Change-Id: I95766775f0b55a93c488b51600a24014ab9c48dd