Merge "Emit all APIs using Predicates." am: a71b9160a3
am: a5ca5392a2

Change-Id: Icd013348fbac07e003d7ff2893cf7866a86cde17