Merge sc-mainline-prod to master.

Change-Id: I2891957f075042a404eef8d27dc09c27e273c0c4