Merge sc-mainline-prod

Bug: 189946434
Change-Id: If84fbbb0e964a52ee141d5055cab4196c4f62e04