Merge sc-mainline-prod

Bug: 189946434
Change-Id: Iff352f1100cc54225a36aa3ee4a81be404ad6b3c