Merge sc-mainline-prod

Bug: 189946434
Change-Id: Id29d3c64c470a647450331d63d82c3f0d5a44525