Merge sc-mainline-prod

Bug: 189946434
Change-Id: I995f4bf479c54d8a468e9f9957ef731bbdc39d70