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