Merge sc-mainline-prod

Bug: 189946434
Change-Id: I57f81aa52971c8bc613e42f975f3b07d5efb4c06