Pick commit per NVD report. (From OE-Core rev: e8fbb7521e0113c467e07ba473a46612709c5311) Signed-off-by: Peter Marko <peter.marko@siemens.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>