Merge sc-mainline-prod

Bug: 189946434
Change-Id: Ice557e4c16f16e3e1d1370ba289471d71ea853fa