Merge sc-mainline-prod

Bug: 189946434
Change-Id: I95395bd952ae727f601e2ce0c79c0a7b6f7c842e