Merge sc-mainline-prod to master.

Change-Id: I227691872f79a89d21dfb4cd8ce279e374579309