[558729] Backport emf fix into 2019-06

Bug 558729

Change-Id: Ic5097dfa5f42a435dfc0621a1455bedbec021396
Signed-off-by: Thomas Guiu <thomas.guiu@soyatec.com>
2 files changed