Merge sc-mainline-prod

Bug: 189946434
Change-Id: Id39aa7ddc1e01bb447ee5e1101d87a4acb961b73