Merge "Moved c.a.i.u.Predicate[s] into legacy-test"
am: e476a30575

Change-Id: Ia0b3ebd30e045fe2b26fe9a78b2de665bf960b0c