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