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