Merge sc-mainline-prod

Bug: 189946434
Change-Id: I104a279ff7451fb966cc6a672fc99c8dcded3c16