Jira: ZEP-1415 Change-Id: I4a009ff57edb799750175aef574a865589f96c14 Signed-off-by: Anas Nashif <anas.nashif@intel.com>