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

Change-Id: Ib64efa0332d5f5bdbab99f3271bc058c54bfaa35