Merge sc-mainline-prod

Bug: 189946434
Change-Id: I348d71f485ecad207189ee3593244d828e94ef6d