Merge sc-mainline-prod

Bug: 189946434
Change-Id: I6a191ca9abd060d4b9954ca9db52cc8da33d1b72