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