Merge "Add Kernel, Method, and field IDs bug 7182873" into jb-mr1-dev