Merge sc-mainline-prod

Bug: 189946434
Change-Id: Idff10180bde2c249fe708cc76449bafdea0c0963