Merge sc-mainline-prod

Bug: 189946434
Change-Id: I04f1bc396cfa7c92e3f5648075274da23a75db51