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