Merge sc-mainline-prod

Bug: 189946434
Change-Id: Iccd8972f7bd865e1e6c425a3f00b5a0fed06101b