Merge sc-mainline-prod

Bug: 189946434
Change-Id: I42e407c7989fa7caebe3e4504f2d3e1afddf30ef