Merge sc-mainline-prod

Bug: 189946434
Change-Id: I1d20fb8ab9b2ef6f28932bab13b8d055f10d3e28