Merge sc-mainline-prod

Bug: 189946434
Change-Id: I0bc687659f9d6518f1c9b8be4fb101d431ed12a1