Merge sc-mainline-prod

Bug: 189946434
Change-Id: If2944fe994faf9ea7d7721972d0418d2fccc1c2e