Their classpath dependency was missing (cherry picked from commit 6c8d5962) Change-Id: Id4f489c140585c62b6c105533b97837612c6199c