Merge sc-mainline-prod

Bug: 189946434
Change-Id: I016a817432e96160ad1ebd50f8823637a1d22154