Merge sc-mainline-prod to master.

Change-Id: Ifa77184ec091679292b6254aae622e59fbddff4a