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