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

Change-Id: Ibc581c8ce0f859d17dd387e29e37fba6184b3488