Merge sc-mainline-prod

Bug: 189946434
Change-Id: I9e2007446bdba201efb29edf93119fd74c354559