Merge sc-mainline-prod

Bug: 189946434
Change-Id: I284b5cc0f5a36a4783acd75ee75183ab176308fa