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