Merge sc-mainline-prod

Bug: 189946434
Change-Id: Id71573b66727bfffcdb043f7cae8ef3ef777729d