Merge "Allow using reserved package IDs" into pi-dev