Merge "Merge "DO NOT MERGE: remove 2 hammerhead knownfailures (fixes are in) am: a8f267cd3e  -s ours" into nougat-cts-dev am: 482454ba83  -s ours am: f7f227ebf3 am: 9bae6fb9f0 am: 7a83b337a7 am: 730eb43a21 am: 13ee0fcfc9" into nyc-mr2-dev-plus-aosp