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