Merge sc-mainline-prod

Bug: 189946434
Change-Id: Ic92843a6255d46469779c1b7840c48910329ab71