DO NOT MERGE: remove 2 hammerhead knownfailures (fixes are in) am: a8f267cd3e  -s ours am: e385b20af2  -s ours am: 0d028752b9 am: 183ba67ab1 am: 8bd3cf3654 am: 81c56772c8
am: 68e98d668d

Change-Id: I5a3b0e7334747f723c18511546a674b1eb9e30d3