Merge sc-mainline-prod

Bug: 189946434
Change-Id: I6e27b220a7e94739412bb332791ad106aca16f91