Jira: ZEP-1857 Change-Id: Ie9647048544442a004f9b55e3ae889f472b08281 Signed-off-by: Sathish Narasimman <sathish.narasimman@intel.com>