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