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