Merge sc-mainline-prod

Bug: 189946434
Change-Id: Iff3ab8b537d9acf885657cfc4923b3315b5d671b