Merge sc-mainline-prod

Bug: 189946434
Change-Id: If1104f9dac53a7a3b9a77c66fadd272f2b8614d3