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