Merge sc-mainline-prod to master.

Change-Id: I1660569668642ec9e2c7895a15a1fd7fb8764fd0