Merge sc-mainline-prod

Bug: 189946434
Change-Id: I9fa34d5d2427779788fa0b950299b5ab9314d85b