Merge sc-mainline-prod

Bug: 189946434
Change-Id: If0fc552d95b709d1688a6952a9d89aba72888dba