Merge "Moved c.a.i.u.Predicate[s] into legacy-test" am: e476a305 am: 3215c85d am: 19e2a75b -s ours am: e80496e3 -s ours Change-Id: I07084ae75db5b54035b8bf52583597b3794a895e