Merge sc-mainline-prod

Bug: 189946434
Change-Id: I5ef543d58ef1a66c65b173f9c386292d0768bfa5