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