Added     dependency on clover (cherry picked from commit abb89ac)
Merge remote branch 'origin/trunk-gd' into fb-YAHOO-311-trunk-gd