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