1) Add deps to all that is needed. 2) Update releated spec tests. Change-Id: If7dffdabbb4ea57763f41b7a2a6adf9d274b29bc