Merge sc-mainline-prod to master.

Change-Id: Ie72e26b8550c54567e8e70634d6ed025e55a18fb