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