Merge sc-mainline-prod

Bug: 189946434
Change-Id: I1fe09ba0eb037acfdb8ddb33059348e378777e25