Merge "Avoid warnings about synthesized IDs." into jb-mr2-dev