Merge sc-mainline-prod

Bug: 189946434
Change-Id: Ibef86655b1579fbc2be0ca4e51bd99494ec7c817