Merge sc-mainline-prod

Bug: 189946434
Change-Id: Ibfa22858e70885c7bdaf03d8a45966dba37c8d24