Merge sc-mainline-prod to master.

Change-Id: I0efc48448761331630e281b77b796a5f56bb8275