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