Sync OID numbers with 1.0.2 branch.