Merge sc-mainline-prod

Bug: 189946434
Change-Id: I9e9cff9005bd2acb5ea646eb37492500fefa69ba