Merge sc-mainline-prod

Bug: 189946434
Change-Id: I974290ac6a3e8db3a933554508bd2462a0a7de0d