Merge sc-mainline-prod

Bug: 189946434
Change-Id: I642934d0ffe9301514dae59a31c6400ee0a34b62