Merge sc-mainline-prod

Bug: 189946434
Change-Id: I164c5c485f5d5637f5f5bf09bff502500ca155e2