Merge commit '0259cb1c5046104edbc5dfdf41581b204d733d67' into sc-platform-merge

Change-Id: I377f660aa907aeb7ca37799b53c9e2f295975a51