Merge commit 'b534f2fbc0308caf3e33f5054890a44a84664eca' into sc-platform-merge
Change-Id: I70520fee2d1b11928fbf94eeb963ac861a258236