Merge sc-mainline-prod

Bug: 189946434
Change-Id: I3678b1cab9d11e5cf3f6d12e081c32a7c171bfd7