Merge sc-mainline-prod

Bug: 189946434
Change-Id: I7a9a9213c35d3f03b7dcc34306563097e7063cc4