Merge "Update interface quota on the handler" into nyc-dev