Merge sc-mainline-prod to master.

Change-Id: I750d67e40c814e1111f7bf4e7cc149b544a9248b