Merge sc-mainline-prod

Bug: 189946434
Change-Id: I9e555c48aac346da23b76f79575427c8e9b61c2b