Pick commit from 2.12 branch. (From OE-Core rev: ab804cd27ecf7ee65a9feea477140502ecbc0d73) Signed-off-by: Peter Marko <peter.marko@siemens.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>