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