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