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