Merge sc-mainline-prod

Bug: 189946434
Change-Id: Ib7c13d4209d9d0d73f08ec2c2792c23471a4a5d7