Change-Id: I75fe1443fcaf2272da10b6e5be366cd2ff304b35 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>