Made previous change less invasive by slightly changing signature of onData and using new BoundedDecoratingMatcher within it instead of wherever it is called.
Dagger to 1.2.1, guava to 16.0, no code changes needed.