Jira: ZEP-1391 Change-Id: I32d0acfc03c57b305667746e9d8315100dec6833 Signed-off-by: Maureen Helm <maureen.helm@nxp.com>