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