Merge sc-mainline-prod to master.

Change-Id: I4a1471339cd7825028272f670e5a0b85a45d7256