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

Change-Id: Icb146259935a138dc45b91c0f023035aed72cb5a