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