Synchronize code with sha1 5891cb4b2e813d1c9d10def998952b062304e43f

Signed-off-by: Carlo Caione <ccaione@baylibre.com>