Merge "Emit all APIs using Predicates." am: a71b9160a3 am: a5ca5392a2
am: c14cbaa755  -s ours

Change-Id: Ie9c512377d12d9237e92d6b13c43bd09ece1f1fe