Merge sc-mainline-prod

Bug: 189946434
Change-Id: I3aad2c05a1b42703e1c11778e91dee4d58a2d37d