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