fix dependencies on the future

Change-Id: If24b95e036a933213ae9ca95fd35749d7ed5fb36