Merge sc-mainline-prod to master.

Change-Id: I946f5f37013c0922dd499b949524e6d821ed344c