Merge sc-mainline-prod to master.

Change-Id: I4e585681766f1e4af161942867b6ad74e911fdf3