Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com> (cherry picked from commit e68753b4)