Merge sc-mainline-prod

Bug: 189946434
Change-Id: Ic6cabb559f4011db8ce7c65bf94866326039792c