Merge sc-mainline-prod

Bug: 189946434
Change-Id: Iab818d5e31906af9c300e00d9a0339c8aec5eda5