Merge sc-mainline-prod

Bug: 189946434
Change-Id: Ifcab6d9a0506eed923c8fb3857a1e85c71308945