DO NOT MERGE: remove 2 hammerhead knownfailures (fixes are in) am: a8f267cd3e  -s ours am: fce73a9d80 am: 813573950c am: a5034f0b4c am: 1a277a998b  -s ours am: 1bd235f277 am: 906e50365d am: 5484339a1a am: 4ff7544d15
am: 9636235de9

Change-Id: I6a8055a6bb921d96c8fbbc68c8d51ca39eda8913