Merge sc-mainline-prod to master.

Change-Id: I67e987723ddb0e63bb40a568b38b1c359f88d097