Merge sc-mainline-prod

Bug: 189946434
Change-Id: I41844fad2a0f6846c96264dac20c5185c5cdd07c