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