Merge sc-mainline-prod

Bug: 189946434
Change-Id: I7bb99a34072dbe43d7752971a3da8199e0a51aec