Merge sc-mainline-prod

Bug: 189946434
Change-Id: I67c8da6450802de958e0f3d031317763b4daa680