Merge sc-mainline-prod

Bug: 189946434
Change-Id: I07a7a38012923d97d7fc81ce405fb6529b52c0ef