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