Merge commit '7e6b767f6024fefd107ad788d6885dd64964540c' into sc-platform-merge
Change-Id: I8dc3bf8912470f02070f5886c86668e1d6e6cf3f