Merge "Stop using c.a.i.u.Predicate outside test-runner" am: ee2fb3c59e
am: 847df2cafc

Change-Id: I3d5f64b3551df8d5b3af1a18dfd63147fa186df7