Merge sc-mainline-prod

Bug: 189946434
Change-Id: Ibbf53b4f34c24c3c514257a5f849e689f83e7cb3