Merge sc-mainline-prod to master.

Change-Id: If8621503ed1577af4ae557529f6a21ca8b0ce84b