Merge sc-mainline-prod

Bug: 189946434
Change-Id: I826a46bb0bb0f00f6e3e5fa43cd18e6b164cbcf2