Merge sc-mainline-prod

Bug: 189946434
Change-Id: Ia02f2b59282945e8103de507c90a69e310409430