Merge sc-mainline-prod

Bug: 189946434
Change-Id: If85e2d8060d423a40c4afcf7d7d73feed900dd5f