Merge sc-mainline-prod

Bug: 189946434
Change-Id: I6cdcc935cc593304c3f8e02c123e68499ccc331e