(From meta-yocto rev: 20903fc4df6eed27202c2bf015d2da402191205a)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>