Merge "Use factory methods for RestrictionEntry" into mnc-dev