[558729] Backport emf fix into 2019-06 Bug 558729 Change-Id: I6ef76c877834cbcea3a7a42f06a6762e803e4c4c Signed-off-by: Thomas Guiu <thomas.guiu@soyatec.com>