Merge "Add support for getting arbitrary kernel and field IDs." into jb-mr1-dev