Merge "Merge "Stop using c.a.i.u.Predicate outside test-runner" am: ee2fb3c5 am: 847df2ca am: 3b24847d"