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