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

Change-Id: I6c284079f73fffea6a05a11019a6a2f386de1127