Merge sc-mainline-prod

Bug: 189946434
Change-Id: Iea634812c7d7d31507810f1f0a875b4498753984