Merge sc-mainline-prod

Bug: 189946434
Change-Id: I3c915f645c95a2e778b5ad0f9010acb1c970fd39