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