Merge sc-mainline-prod

Bug: 189946434
Change-Id: Ic558e56f1d6cefe51f4d2996df26b3536b86d6e9