Merge sc-mainline-prod

Bug: 189946434
Change-Id: Ibc746b704f86dfebb6ac703cef82337a06831cc5