Merge commit 'ec1f42f265f1f4f020174167f1c6a5870e16e980' into sc-platform-merge
Change-Id: I2064de2b58f5d147f64b5b23723ac45ce8cefd1e