Merge "Improve RestrictionEntry API" into jb-mr2-dev