Merge sc-mainline-prod

Bug: 189946434
Change-Id: I80866c7ea03ed7ab107051971d292fb1a161003d