Merge sc-mainline-prod

Bug: 189946434
Change-Id: I938a53bdfd345da26e9b34ada8e9ff387965af2b