Merge sc-mainline-prod

Bug: 189946434
Change-Id: I7e42a9b18a1fd0681754df5c50658d2e4a678b44