Merge sc-mainline-prod

Bug: 189946434
Change-Id: I893d633ba6199a3ae55ebe2d70d8c2aa49f00918