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

Change-Id: I07084ae75db5b54035b8bf52583597b3794a895e