Merge sc-mainline-prod

Bug: 189946434
Change-Id: Icd5fe8c514a3d291fb066d9ce2bd722d0c96c82a