Fix versions of dependant modules (#13026)

Change-Id: I3f6f039209aff9e148bacda8ca440367fd834872