DO NOT MERGE: remove 2 hammerhead knownfailures (fixes are in) am: a8f267cd3e  -s ours am: fce73a9d80 am: 813573950c
am: a5034f0b4c

Change-Id: I2aab93492eb1355bf66be341027e3f5ada4add85