Merge sc-mainline-prod

Bug: 189946434
Change-Id: Iaaa565cbd89509d715cc97385b975e2506635e6b