Merge sc-mainline-prod

Bug: 189946434
Change-Id: Ieefa79e7a496fe391ecbd794c0b80634129bd9fe